Fixed some issues
final fixed problems