Single file support and small fixes

Fixed some small bugs/spelling issues from the original code and added
single file support