Fixed some problems!