updated crud and little fixes