3.3

Some little bugfixes