further more to NOPs & general cleanup