[FIX] more changes and fixes