add Sin\Cos bounds
minor refactor
merge