added some fixes;)