Minor changes to improve code, fluid and portal removed.