Varous changes and additions here and there