Made lots of changes. God, i need to make small changes and commit them everytime...