bugfix order + cleanup