Commit

Bug fixes