better names
misc bugfixes