Slight tunings and bug fixes