improve singe decompile/recompile code + minor stuff