Balancing stuff, minor changes
merging