few bugs fixed
various fixes