more stylish changes
support added to fm2 to work without goal points