attempt at quick check
some fixes
unnecessary declarations