bug fixes and sooothing
up ver