Some edits + more tips