fix sunset app bugs