General Changes

Added some new things, moved others, and more.