wrong function names
event more bugfixes
Merge branch 'master' of github.com:sirlantis/bridgetroll