minor bugfixes and database-annotation support