merged bugfixes
merged limit database size fix