WIP
fixes comments