Including bower, few typo fixes and code changes