Some Bug Fixes

Can handle a folder now