Improvements
Signed-off-by: Nightmaster <nightmaster@seitaer.com>