setup template + some fix started (need to push to continue home)