Fixing bugs + content