minor changes + added bitmap handler