Review Uncommitted

Review the local uncommitted modifications according to REVIEW.md. Obviously I intend to commit them later. I just want your feedback on the changes and ideas for improvements.