fixed problems, now working