serious cleanup + gaussian beam