updated fragment stack and cleaned up many of the small TODOs