Fixed all the issues we experienced earlier. Consider this a backup working version of features completed thus far.

Signed-off-by: Cory Feitelson <cfeitelson@roovy.com>