Fix position and comment out debug stuff