bugfixes, changes to typer