Some bug fixes in code and slides