Development update

A few new features + bug fixing + general improvments and development