- Lots of small fixes