All features, finally
some prettify