Added all word types to database + some fixes.