If-Else Statement + various other rework/fixes