Fixes + Tests + Readme