Fixed some problems, still fals