fixed some things, still has problems with arbritray size