Round of fixes and tweaks for #54

@45678 Please feel free to resume pull requests. Woo, teamwork! :-)
Remove no longer existing dependency