Code review

These are the proposed changes for Alpha 2. Do you think anything else should be added before releasing?