compile + small changes