Added more stuff

Some code was cleaned up.