Additional world methods
Added debug drawing, fixed merge conflicts