more minor changes
updated floorplan files
merged