Fixed some smaller bugs...