pfds fixed
Small bugs fixed