Made fixes, should be working now.