weekend work - grunt, e2e testing, fixes