Updated features a bit