Take 2

Few fixes for things to start to run. :)