Improved resizing & other