Added comments, changed some visual ideas