refreshes added, minor changes, tweaks and bugfixes