Silly bugs fixed
Pushed version