Tested, fixed errors - both appear to be working. #229