fix loads of width/height issues, misc fixes and more