Minor fixing + adding functionality