small fixes & forms