1.1 - fix all the bugs