Updated readme, removed bugs