Some bug fixes, most of Fan Sign In