Cleaned up code

uncommented functions in BSS so they were being called