Added address limiting, cleaned up database usage.