fix some problems but still not really working :)