refactored the classes, factsheet form fixes.