Minor updates & additions