Fixed blank lines
Fixed a few bugs