Fixing bugs, adding features