More optimizations + executable implementations