small fix's
Mid work commit, working on bus compiling
Problems merging