commented more -S stuff; comment extra -D stuff(WIP)