Some clean up and added couple datatexts