some fixes
Minor updates. From Tomorrow I'll start working seriously