Version 1.1 bugs fixed