Tons of improvements :)