Fixed some problems... Maybe...