General Edit

Completed a final bug check