Improvements

More to come...
why this // FIXED comment?