Minor changes

Some minor changes. Some new stuff, some from the forums