remove some warnings and add emittance calculation