drawing fix
mapping fix
commented out unused variable