Quick commit, few bugfixes. No new functionality.