Minor changes, need proff reading