Made a good start on console 1, fixed some makefiles