Improvements on pull-request

along with minor updates.
This includes and closes #2.