Almost final update

Added comments and changed some things