a quick update and some errors fixed