some updates and bugfix