Fixed bugs, fixed makefile and added shuttle dragging