cleanup + added a bunch of contracts + rename