Difference page for slaves also updated, some checkstyle fixes and code improvements.