Updated files

Various small changes