100 Commit

Bug fixes