reorganize + fixes