Tweaks. Fixes #2, #3, #4