fixed database non-submissions
added more state colours