[go2school] cleanup and bug fixes