Minor updates and refacotrings