BAM. bugfixes + featurs added