fixes

+next questions