fixes + always set width & height