several issues solved