Fixed some problems... hopefully...
Fixed some problems... hopefully...