Bugfixes + features added (2.4.16)

Signed-off-by: nixnodes <code@nixnodes.net>