bug fixes and minor styling changes
Merge pull request #49 from jasonk54/jasonk54

bug fixes and minor styling changes