Added booktabs package
Added todo and fixme macros