Minor Fixes, Compiles and runs!