Extended size-of
Changed function names, added more functions