#406 liniting and minor fixes