small internal fixes and updated version