updated stuff and fixed bugs

for the love of everything, please commit