Time to read + some fixes