fixed up most things + css