fixed problems and updated version