Fixed many issues

it is now ready, i think ;)