fixed/reverted some stuff