Pack of updates and fixes

Please add these comments as much as possible all over the code