Added comments and the such