Fixed some small bugs..