Totally. Going to fix all that stuff in the next branch.