Finishing Changes

Large update with all finishing changes