Fixed several bugs
WTF is on Line 12??!