fix a bunch of issues, maybe getting about time to release something