First Merge Request

Did some minor changes directly on develop. Didn't see the necessity in opening up a new branch for it.