removed some logs, fixed bug