Fixed / Added things (I really should start committing changes right
after i make them...)