major updates to functionality across various modules. will start to
commit more regularly for better comments...