more cool stuff and a little bugfix