5.1 WIP b

minor fixes