Looks better, minor bug fixes