added some things. vague, i know.