Updated lots of stuff and implemented GregwarCpatcha