Dev

All my changes. I wasn't sure whether to make corrections based on our conversations, and trust you will.