fixed some check style issues, changed DB