A lot of tweaking/fixing redoing stuff