more stuff

so tired...finish tomorrow...