bug fixes after first tests