mega changes
various changes