Fixed some outstanding bugs
Added some extra required files