various changes
general improvements