Minor edits, removing some default code, fiddling