Minor comment + magic number fixes