progress
Merge pull request #12 from marqh/tweaks

progress