revamp

many changes