some fixes + added code for last update :D