Re-organized things, balanced some things