lots more working stuff inc edits