some cleanups and added rules pages