Fixed namesystem and other small changes