Commit 56ec31270a556acf5fdd589fa0da3b6deb56a216

nelisky 2012-03-12T16:20:03

small fixes and cleanup