Dev

Mainly small fixes.