refactoring api methods into module
merged master back in
finish the merge + some improvements on comments and such
more realistic bumper
solve several bugs