cleanup; add Laser and UM classes