additional bugs fixed