First Commit
Small fixes