Good days work

Fine tuning and stuff