fix details here and there