More WIP, minor fixes