Second level and many bugfixes