Final touches. Fixes #1 Fixes #2