some initial bugfixes! it all works!