Some updated stuff, a small bug with shell spawning though