Major improvements + very handy curves