More bugs fixed, looks better