updated all the things
fixed warnings