Overall improvements

Signed-off-by: xchs <github@gmx.net>