Tons 'O Changes

Too many to list individually, getting ready for initial release