ready for beta production
minor fixes