Fix stuff, make size a bit smaller