Brought some variable and bitmap declarations up to date