first level. Also some bugfixes