updates some name spaces and added comments