tweaks & bugfixes
refactoring; grunt tests;