couple for problems2 solved + tweaks