kleine performance & bug fixes