Better variables
README updates
More improvements