some fixes.. I am lazy to comment changes