Molerice made some fixes