Small issues

Many small fixes and feature requests