some minor changes / working commit