Fixing some errors, more to solve ...