initial changes/fixes