big fix and other tweaks