cleaned up, began work on adding section selector