Improvements and fixes by dusank

I am currently in the process of reviewing SBT in Action and will be pushing any improvements and/or fixes onto this branch.

=Dusan