Little more functionality and readme update