More intuitive changes and ack & some init changes