FIX - various improvements