fixed more bugschanges