Stuff

Several additions & changes