cleaned up checkbox stuff