fixed some, still settings to take care of