Alot of good fixes made