Dev_v0.8.1

Fixes some bugs