Various updates

Signed-off-by: Rick <rick@rick-K53E.(none)>