Minor changes, works