Fixed lots of stuff and added Jitter