minor fixes and experiments