Add things, cleanup, ect...
Signed-off-by: task650 <task650@gmail.com>