Bug Fixes, made size smaller