Updated client with UI, added comments