Bug fixes

This commit should fix some minor bugs as well as address the bower issue mentioned in #24.