loading bug fixed and controls modified