made a couple of changes, should be working now