Fixed crashes (at least the ones on startup), and commented out some silly code