fixed Y definition
Finished Felixs 3rd round of comments
more felix comments