Bug fixes before doing the motivation section