Fixes + changelist

v. 0.11