fe
merge issues + fits tests