major updates from fulleron; tests