Added & fixed some objects & forms