Fix #33, Fix #34, Fix #35 and improving walkthru