typo
small tweaks
bugfixes and tests for better performance
Merge remote-tracking branch 'origin/master' into andyblac