Refactoring the slip builder and a few other related things