fixes for Jan pt 1