more stuff + cleanup