fixes and updates;
updating