Added a bit more fixes.