Some bugfixes & help