database load develop
minor improvments and bug fixes