Newaux

smoothing and bugfix