Committing all changes from the last three days

Lost all commits due some error....