some int to int? tweaks..