fixes and polish
final fixes
Merge pull request #12 from kmahal/master

final kmahal fixes