Fixed bug and added content