updating things a bit
adding a few more things