Fixed various small issues
Made comparison operators inline in header