Testing lastest changes and fixing bugs