more simple stuff, bug fixes