Updated/added comments in development version