Updated features / small fixes