fixed it pretty much.. #155