fixed death bug + reordered drawing code