minor bugfixes. completed verion 1