lots of bugfixes
separate & rename