Initial Commit with a few fixes