Added and changed several non-functional functions