Update

Added CLI features and fixed parts