Fixed Bugs and added content