FIX/ENH: misc + add ICA