Added tracking code + some fixes