fixes for 1-3
fixes for 1-1& 1-2