Added more working stuff, also fixed computer crashing