Modified DB and some little corrections.