fixed some problems. works better.