Testing bugs removed; if works.