Fixes outstandign issues, tested and works.