Unbreak

This module seemed to be broken. I've fixed a few bugs here.