More stuff. More bug fixes