fixed some problem should be working now