Fixes Some problems, properly synchs us with MLaws