fixed final warnings regarding ordering and unused variable... -sai