Fixed
Late night fixes