Updates before handing in

Signed-off-by: Knae <general124@hotmail.com>