finishing touches to functionality
minor changes