Fixed #1

Changed a couple little things, issues gone now.