adjusted errors and forms associated with clearance
fixed pull request issues
fix pull request issues