added the clerb extension, cleaned up some stuff