Various improvements, still fucked up after a resize though.