several styling fixes, including fixing issue #3