some bugfixes - modal bug still in place