updated a few things and fixed a few bugs