various changes and updates