various changes that hasn't gotten pushed in a while.. so i just pushed it all