Small bugs, pretty much everything is done