a few misc adjustments... it's sort of buggy