Fixed a few edits, started condinittionals