Added content, fixes, removed unnecessary files