fixed todos and switched math to real only