Fixed and added many things

Too much to describe