Major Update

Too many fixes to discribe