even more bug fixes !!